Fixed some more mixed up parameters of target classes.