Fix history and core_tracker more