Rollup commit of misc changes