Another batch of stylefixes