Devise-invitable fix and others