A couple of devise bugs