more fixes to migrating to devise