more cleanup
Mac accomodations