Fix specs and controller code.