Form validation fixes