Test/fix armv7 failures on 32-bit