Application fixes and more