Fix norm to comply with std:: and fixes to numeric
Header safety in dispatchers