v4 Fixes for Complex Permission System