Fixing Client Compile Issues