Error message upgrades and cosmetic fixes