Some modular tweaks