Some initial corrections to the way the composer does things