Some corrections to compile on Linux
removing stuff that does not work yet