Update roles submodules, and other fixes