Various Fixes #2732

Job	Run time
ubuntu-20.04-gcc-9 Release Python 3	15m 49s
ubuntu-20.04-gcc-9 Release Python 3	15m 49s
ubuntu-20.04-gcc-9 Release Python 3	15m 49s
ubuntu-20.04-gcc-9 Release Python 3	15m 49s
ubuntu-20.04-gcc-9-tbb Release Python 3	6h 0m 14s
ubuntu-20.04-gcc-9-tbb Release Python 3	6h 0m 13s
ubuntu-20.04-gcc-9-tbb Release Python 3	2h 25m 7s
ubuntu-20.04-gcc-9-tbb Release Python 3	17m 35s
ubuntu-20.04-clang-9 Release Python 3	15m 49s
ubuntu-20.04-clang-9 Release Python 3	15m 49s
ubuntu-20.04-clang-9 Release Python 3	15m 49s
ubuntu-20.04-clang-9 Release Python 3	15m 49s
macOS-11-xcode-13.4.1 Release Python 3	1h 1m 15s
macOS-11-xcode-13.4.1 Release Python 3	1h 1m 15s
macOS-11-xcode-13.4.1 Release Python 3	1h 1m 15s
macOS-11-xcode-13.4.1 Release Python 3	1h 1m 15s
	20h 54m 41s

Provide feedback