Small fixes for the rebase