This patch resolves a few MARC21 Framework issues for