Changes for development on Mac