Fixed lintian warnings
Bug fixes