Style, Multiplatform fixes