Fixed some places where we directly referenced things instead of checking their options.