Updated some more from upstream