Fixes for MBPr setup and change of folder