Fixing minor issues with client/server com.