Fix warning, add @0verride annotation
milestone