Minor changes for client alpha test version.