Minor fix on review comments