More 0.9.x accomadation.