fixed devise issues