Fixes for messed up rebase