Fixed some errors that showed up on first time app startup