stage5 mac fixes