Added fixes to config options for modules