diverse Typecast-Fixes

Change-Id: Ie8b87b64bc90855c99206830a05cd5d029b0bef8
10 files changed