Tweak history handling