Added better debian7 support