Removing still more bugs.