Updates towards compilation on linux