Update to 2326, bugfixes