Controller fixes.