Client side bug fixes