Clean-up Joint (fix compiler errors)