Some small client improvements