Fix all the specs!