Some fixes to complete the app