hot fix database issues