fix module conversion issues