Fix build issues due to mainline sync