Minor fix and script test.