Some application edits