Deb 0.6.0 fixes