More encoder graph fixes