Trivial: Some small tweaks/cleanups