Fix rekishi integration