Unresponsive app after updates

Other EverMerge issues: