Laptop migration fixes