CORE-4529: Corrected some validation issues