Clean up configuration, and fix a few uncovered bugs in specs.