Fixed type erasure warnings.

Reviewed by: kiyan