Fix options handling.