Fix up Electron Beam options
Didn't commit properly

Change-Id: I89ad1426da6502d072f72c80440d5453c107d0f2