Fixed a few more mystery failures.