Few more combat engine bugfixes