Small changes to bring Nicks PR inline with crossvalid module in outs. 8643056dfd9c677bd60362fba72c0768e0931f02