Fixes to GM create/edit restrictions