More fixes in support of AUT-725.