Minor cleanups and fixes.