Fixed arm issues