Adjustments to take advantage of legacy controller changes