Fixed issues with the way Rewards are generated