Fixed issues with app