Fixes for damage
Merge with stryker origin