B-60117 Fixed compilation errors caused by changes