Various changes in preparation for new MacBook Pro