Fix AppLuncher errors
Merged master fixed conflict