Nit align v1 to master

There is an outstanding couple of nits required to align v1-train and master.

Fortunately only few differences remain now :)