Improve activity leak detection