Fix build issues with last merge