Small fixes
Module Fixes