PDIO-210 Fix classpaths