Minor cleanups and docs updates