Small fixes in controllers. Building TODOs and FIXMEs