Fixes for arm support