Update Makefile

More cross-platform fixes