Fixed a couple problems to get app fully working again