Multiplatform fixes