Fixes for the modules