Undid some superbugs

There are still lots, though...