fixed moz issues