master/slave launch fixes