Fixing lint issues in src/core