Fixing a few specs... but still tons of failures. Sigh.