Fix build failure on certain Linux systems
Fix build failure with more recent OCC versions that dropped PI
Draft: Fixes to primitive-enabled tools