Tweak some errors