Various tweaks to error pages