Fixes for new modules