Fix most specs and make some pending