Minor client changes

Getting ready for teambuilder work