Fix server-side annotation creation