data-to-opts fixes