Pre launch fixes 5/18