Fixes map state helpers that were causing false fails.