Client side fixes