Minor changes towards the MAC build