Some fixes for the application