Fix issues with DB change.