ensure ids are always assigned as integers
Merge branch 'fix_id_assignments'