Some stylefixes