[TASK] Fix some annotations