Test run against the updated util-x, let's see what needs fixing