More build fixes for the merge from Master branch