Fix normal computers and migration