Merge pull request #334 from csnv/somefixes

Fixes bard song assassin cross of sunset. Thanks to Juvia