Small changes to Pi client.