Make system more robust to both ARM and Intel compiling.