Some slight mods