Fixing issues shown by lint.sh