Little client changes