Fixes for Issues with rewards Mapping