Fixes for various global style overrides