Updates to work on linux