Repaired cross platform compatibility issues