Update and fix specs.