More dodgy Courtyard fixes