Changes needed to work on Linux