Fix code broken by rebase and merge