fix issues with devise