Emiya0306 and loadchange minor, fix Dependency cycle error