Merge "Minor PECL client fixes"