Fixes for Debian Wheezy and lintian fixes