Fix variables for New primary keys