Minor fix and debug test.