A few minor changes after rehearsal