Add missing option checks