Tweaks for history