Various history fixes