Fix build issues due to previous bad merge