Minor cleanups to install