fix to build with 2.062 plus a couple of ddoc fixes