DIRAC for XMC-2 and Bug Fixes