Finish strings update and fix crash introduced earlier