Updates for move to MBP