Improvement of cross-platform compatibility