Misc changes before switching laptop