Basic strategy fixes