Merge branch upstream/master

Address a few issues remaining