Squash horrible PR commits from treibholz
Restore Wheezy compatibility & fixup