Updates to allow compilation on linux