fixes a couple of type conversion warnings for msvc2015 Change-Id: I004f072661c981e204bd62b2740201658ad67294