WP-4736 permission fixes