Clean up some reference counting, doc comments and a build tweak