Even more stylefixes