Finished fixing ID defects