Fixed a couple of files regarding devise update.