fix devise issues