Sync with libucl