Minor error tweaks