More minor mods.