Small adjustments to controller setup.