[Mod] Minor tweaks