Fixes missed by rebase