Minor controller changes