Fixing various history issues