Fixed some issues with app