Normalizer and resource fixes.