Adjust to new primops API
Fix imports
Fix imports