opts fixes