minor changes for no-master client