Fix for find_or_create depreciation warnings.