Fix options interface