Minor client side bug fixes.