small mods for consistency reasons