Debug

Fix validation errors