fixes including use of armhf (for now)