Mac prerequisites/ Sergeys changes