Add in changes from upstream