Mac errors fixed