Clean up and fixes in debian/control