Fixes to history