Bug fixes for client demo.