Import from samosa: Various changes from James