Fixed some Issues with switching rigs