Fix some minor inconsistencies found during the first session.