Changes from review comments
Fixing lintian warning