Fix some validation errors for 3.0.12