Client side fixes.