Update to address database creation

And minor other cleanups