Fixed things to work with 0.8.x