Fix compilation for ARM

Please merge!