More fixes on form