Fixed ARM build