compilation fixes post rebase