More styling compatibility fixes