stage1 mac fixes