Fix some etag stuff