Tweaks for errors