Small fixes in annotations.