Some minor mods