Some ETag fixes, part one