A few small mods