Very minor client changes