Mas tweaks