Fix core.dll-related