more setmaster fixes