Some hot-fixes for CFDIs