Some partial fixes for wheezy