* Fixes to strategy