some fixes for new modules