Form bug fixes