Cleanups that I spotted/needed when setting up.