Minor tweaks and cleanups