Working on stop app fixes.