Bug fixes and API Client updates