Fixed multi-os Makefiles