More fixes to fuzz