Building on Linux fixed

And also a beauty-fix for Makefile