more fixes for headers for arm