Couple of bug fixes for client side graphs