pull in fixes from guigui2