fixed compilation errors after rebasing