Changes to work under linux