Work around some PuDB bugs