Fix some annotations