Fix rebase issues missed during rebase, caught with grunt and tests.