modular: minor tweaks