History and Animations bug fixes