Fixes for fuzzy tests

David Schäferrequested to merge
fuzzyfixes into develop

Get rid of some more of the ubiquitous overflow errors

Merge request reports