Fix installing/reinstalling packages with a + in them