More fuzzing changes