Fix for new client

Some examples don't adapt to the new client. This change fixes them.