Cross-plattform compatibility issues fixed