Resolve client classpath issues