Missed a few Type parameter corrections.

Issue: FMA-45
Change-Id: I4857df1699914d36f0f2c83575c8ed46550d153a