Hopefully fixed database issues..