Make/build fixes in prep for v1.01