Minor changes on annotations.