Id creation fixes