Tidies up some generated ids
Fix regression