Fix devise issues