Modifications to sole errors since adding application class.