Minor changes after trying to use includeFlat