A few minor tweaks, a broken error message