Fix things found by coverity in the 0.1.0 release