Fix some types in virtual methods to properly override.

Thanks to SAL_OVERRIDE!
Adapting to 1258b576aef2ff3cdd4f44e1c03edb8c862a79f6

Change-Id: Iafc9660312ad33f6136c15170c35a59e61c76b26