Some dependencies and db fixes