Minor fix + build