Minor tweaks/cleanups