Fix @derdons comments and patch the rest of the Results changes.