Fixed devise issues