Application fixes