Some housekeeping and work to make project functional on Mac