Cleanup
Fixed issue with multiple platforms