Fix userspace program in light of new config changes.
Add a todo.