Fix location of instance variables in strategies