use uint32_t where appropriate, silences a few warnings Change-Id: Ic362b08868b00f4828982757a7bcee081d50308d