More courtyard fixes (1000th commit! :D!)