Fix some MBP installation issues