Updates normalize to work with punch