Fixing up user annotations