Fix for GNU/Linux (makefiles and code)