Minor adjustments to form classes