Fixed some ID stuff