Fix App Bootstraping