Fix options conversion