Smoothing the move to Windows 7