WIP - fix rebase errors