Misc bug fixes
Fix more try/finally async bugs