Upsert fixes.