More fixes, starting addroletouser