Couple of fixes to the build and docs