XD-1125b: Another batch of ModuleOptions

fixed typo while merging (topcis)