Created_at and updated_at wasn't generated when using Upsert. + Some other mini fix.