Fixes for long running app