Fixes to run app in the midlle of changes.