Fixed compilation errors after rebase