JavaScript errors when annotations are merged with comments

First, if you hover an annotation that you just added you get:

i.getStorage().get("prototype_event_registry") is undefined 

The issue seems to be that the comment reply button doesn't have any event listeners or maybe Prototype.js has changed the way it stores the event listeners. In any case, this prevents the reply button from working.

Second, on the comments tab, if you:

• click edit
• click cancel
• click edit again

you get

c.down("form") is undefined

And the annotation is replaced by the following information message:

This annotation does not exist anymore. Please refresh the page for an updated view.

I haven't tested other things because I'm not very familiar with the annotation feature, but I have the feeling that there might be other problems.