More improvements for specs.