Merge "Some launcher bugs:"