Additional bug fixes to compatibility version of API client