Minor fix, cleanup.