Some Bob 3.0 fixes.
And a build of the former commit..