Minor fix to last initial related changes