Changes for 1.9 compatibility