Controller minor adjustments