Compile fixes post-rebase