Make things work more nicely with 1.9.X