Fixing us and task controllers