Some fixes in devise