Maint fixes

Won't map merge with this one since it includes previous changes.