Some changes to address lintian errors