Updates to make code more Linux compatible