Minor changes to work with Linux