more strategy fixes