Cleanup, and a little fix so you can volume mount the data-directory without a problem to keep db over runs