Minor Client Patch