Option fix continued
More Option fixes