Fixing problems when creating forms