First changes for integration in clamp_vm_init