Fix bugs created by not updating the app in 2.5 years