Fix some annotations and documentation issues