Fix some bugs in the strategy application