pre launch fixes