More changes to get things inline with new style