Fixed collision resolution on arm controls, mostly