Fixing lint issues in src/core
Fixing left-over from rebase