FIX: Bad references in modules.