fix compilation errors resulting from rebase