misc fix: in developing, can't be compiled.
Merge branch 'debug'