Some small mods