Small cleanups.
Regenerate Maps.