Fix some ARM warnings

Fixes #188
Fixes #156