Improved handling of field norm