but some patches from connect fix node issues