Minor fixes for new modular system.