Fixed Crashes that were caused by Glass OS update