Minor cleanups to explorer