Small fixes to resolve Cannot transition state via :next from :payment