Monkey patches for 1.9.x compatibility