Spirit Fixes

Shiro crash, Berith ease-of-binding
Shiro crash fix