Form issue and fixes