Minor cleanups to Main