Fixed some more annotations.