fixes for the Make to make it more cross platform compatible