Fix specs, for oldest changes