fixes for dual-arm usage