Fixes to exit/suspend behavior