Fixes for restart on file change