Debian 7 fixes