Some fixes for app