Fixing linux compatibility issues