Upsert routines inconsistent