Stop making Cornu and Mahisha spawn in the caves. Conceptually, it makes no sense for the most part, it looks ridiculous, and it just makes fighting them tedious. for the wrong reasons. It doesn't help that the tab targeting in this game bad which makes targeting them a massive pain in enclosed rooms.
That's all.