Fixed rebase + build errors