Yet more fixes from libucl