Today
Fix compile errors due to CLIENT and SERVER