More normalize fixes