Fixed lintians
Cleaned up some lintians
Fixed lintians