More cosmetic changes to the forms