[00002m] Some minor cleanups