Bug 830240 - Fix app launching problems