Fix a couple of defects with fromModule