FIX: broken exchange module refs