Minor fix on imports