Fixed some small things for converting to SE 7