Fixing more bugs'