Some changes to scatter and gather .inl files