Added more history fixes for modules