Fixing lint reports...