Fix roles selection

And a few other micro-cleanups