Bugfixes for client-side rendering.