Some fixes from upstream