Debug

Fixed validation issues