Fix role saving