Fixes to makefile for UNIX