Fix unsigned int issues in upgrade files...