Fix not-setting roles not working properly.
Update with more TODOs