Fixed some invalid id errors