Retro PC repairathon part 2: fixes!