Fix around null etags that appear during migration