Review: various fix for modules;