Updates to the Members page and a few minor cleanups from upstream