Fixes for single instance run.