Fixes for wheezy
Fix merge conflicts