Use common alias fix method
Fix small language bug
Fix usergroupmap migration