Include my fixes from upstream