Device ready fix and insert fix