Fixing little stuff in preparation for Jeff to build chat client for Android