Minor fix post rebase