Cleanup of debug messages.
YID missing now will complain correctly.
Merge branch 'test' into dev