Minor client-side changes