Add override annotations to make error prone happy