Make things display properly in 2.0.x