Couple of small changes from upstream