Fix small validation errors