Break the Master Compensation dependency if it is not needed for certain entities. There are times in which not all entities would need to be part of master comp. Please offer the ability to select the entities for master comp and without master comp.