stage2 mac fixes