A few sortron fixes