Fixes build issues from conflicts in upstream merge earlier.