Fixed option fallbacks.