Fix all the current specs