More changes following guided specs