take care of new/different versions of Devise and typo fix.