Adding patches to make nodeconnect and entityconnect work together