Fix all History bugs