A small fix, and more debug code.