Some cleanup, fix warnings raised by Debian packager.