More updates to fix liballocs integration issues.