Fixup basic controllers