Several fixes for hiccups in the annotation process.