Fixed a buncha issues with strategy selection