Trying again to fix database related issues