Various fixes to make dx logout error conditions less confusing