Minor changes lost in rebase