Attempts to fix database persistence issues, jnallard