Various improvements/fixes for frames annotations