Fixed some issues - was not loading the MDC data in some events