WIP fixes to specs.