Track our system/media and Fix up manifest