Fix form reset issues