Fixes for the rebase