Tiny changes to prevent a signed/unsigned compile warning. Change-Id: Id80bad85009df7be039324609528c944b3195c60