Debug

Fixing validation issues