Merge "Correctly use int types and fix uint64_t print." into pi-dev