Fixes for deprecated maps.