Minor Ceremony fixes