Add uthash fixes (obtained from libucl)