Improved linux compatibility