MODULES and OTG Fixes