Fixed compilation errors caused by merging + rebasing