Make parameter types consistent This fixes compiler warnings from MSVC. Change-Id: Iaac0e994869561371295578a893f766493ce0544