Fixed a few things regarding id's.