Changes to get controllers working again.