Finalised MacOSX changes to simplified build system