Some more option handling stuff