Fixes with ID Handling