Debug

Fix validation issues