Today
Fix CLIENT compile errors