This change also cleans up a few uint32_t/size_t issues. Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf