Fixing lint and metadata issues