Some more option updates