ARM build system fixes