Minor changes for Linux compatibility