Preparing for fixes to merge permissions