Stability and async task improvements