minor fixes in client core