Minor fixes on form