more error tweaks