Some more styleguide fixes