Fix up client-side a bit