Fix minor validation errors