Make a few fixes/cleanups.