Fixes compile bugs from poor rebase