Fixed some stuff with history errors