bugfixes on modular shells