Correct stats for 1.9 (alpha!) and support more handler types