Some bug fixes for first time app install