Fix client build/link errors