Minor mods making sure parameter ids match