Fix legacy options handling