COMP: Type warnings in constructors

Some initializations used the wrong types.

Change-Id: I348276e117c14be183f6cf00be814fbfc0dad556
Merge topic 'ConstructorWarnings'

ddcea070 COMP: Type warnings in constructors