Minor fixes related to PopulatuionFunctionFromMaster.