Incorporate fixes from Studio SDK.