Merge minor cleanups