Upsert Fixes