Tweak history and show errors