Various nits and cleanups