Fix Application object throughout app