Unified dll fix