Changes for running on arm