Some minor validation fixes