Some clean up for mac