Small fixes on form controls