stage3 mac fixes