Trying to fix database related issues