A few fixes based on initial tests

During the Dojo today we were hit by the issue of it generating invalid class names because of a mistake in class names.