Fix some validation issues