Fix ENB BH options. Closes #561