Fix multiplatform support