Fixes for merge.

Now trying to debug another server NoClassFound, and missing items