Minor adjustments to some variables