Update from samosa: Misc changes