Mac x3

Just some changes to clean up the Mac sln