Fixes for client

Also some fixes for th elast set of imports from 3.10