Fixed reinstallation issues