Fixed universal joint bugs