Fixing some options glitches.