normalize fixes