Fix options handling