More wheezy fixes.