Draft: Fixes to primitive-enabled tools