fix TBD-947 and TBD-948.
Fix classpath problems.