stage6 mac fixes