New Form bug fixes