more pre-launch fixes