Adjust some variables and targets for consistency.