Patches from modded confluence (brantje editon)