Fixes to routing and specs.