Devise fixes
Might work for Ankit?