Deb 7 fixes