OptionsFiles fixes for recent changes