Changse to get the app to compile and remove warnings