More styleguide fixes