Make things work a bit smoother on fresh machines