fixes to run on linux