Fixing some styles to work better in 5.7