Including parameter validation fixes