Thanks for a cake, Hawk.
Map metrics tweaks.