Fix errors with pre-filled form values