Fixes for compilation on arm