Changes to compile under Linux