Fix things in App