crossplatform issues fixes