Small fix, and dbg