fixing compilation errors after merge