Small tweaks, cleanups