Minor changes in module_transform