stage4 mac fixes