Removing more bugs...