Fix environment setup for rdfe versus arm