Fix conflicts is runtime not buildtime
Use mod2fname whenever it's available