Fix few fuzzes