Fixing some build errors after rebase