Some changes to get app working.