Multipart I-D pre-02 fixes