Fixes for initial app launch