Improve stability for applications other than finder